Adding  feature flag