Finished refactoring of MasterSlave and Connectors