RhoconnectClientManager refactored