Refactoring, split admin commands off