Added user-manager integration