Refactoring into /admin procedures.