Update to include changes needed to support entitlement