Improve the connectors code