Improve the admin integration

Improve the admin integration