Updated Admin Overrides