Refactored admin