Fix for admin and further optimization