Added roles to Users; removed admin from Users, admin is now User method