Updated for admin panel support