Improved admin functions, consolidated migrations