Added basic admin integration and cleaned up helper