Refactor EnableProgression