User management functionality added