Simplify Connector class