Refactoring : use admin for admin tasks