Admin Refactoring, admin preparation