Reworking the core admin api.