Fixed entitlement model and exposed in admin