Add connector-related code
Code cleanup