PLAT-75 Moved the feature flags to separate methods.

Moved the feature flag management to separate methods.