Update to use feature flag