Refactor admin_fields