Admin refactor