Added simple feature flag management