refactored the connector to return only high level classes