better OOP
connectors improvements