Added admin panel support