Improved admin scripts