added user management support