Refactored admin state