Updates to feature flag the work