Refactor as admin tool