More implementation for entitlement endpoints