refactored connector and manager