AdminHandler changes, additional logging