Refactor the admin as a service