More work on the AdminTool