Implemented connector class, deleted selector class, general code
reduction