Replacing the ServiceManagement library with new client library