New entitlement api (ongoing work)