Refactoring
Connector loading in separate class now