Better admin integration