REFACTOR ElasticConnector