Re-write user management methods