Admin handling optimisation