Changes to use the admin plugin