Export support. Updated entitlements.