Adding handling of Capacitances (Laurent)