Update for admin panel support

Still unstable (?)