Improved admin tools