Modified connection class