Change name of base class to ElementsConnector