UPDATED: Admin models updated for new paradigm