Connectors added and refined