Added connectionManager back in