Consolidate admin specs
WIP