Improved predefined stages handling