Add user management feature
Modify order of features