Add a feature flag so we can can enable/disable this feature