Refactor

Some refactoring on Connector Object