major refactoring started over AdminTool