More complete support for user management