Refactoring admin