Feature flag concerns refactor