Consolidated the connection object pattern. References #50