More tweaking of admin schema