Refined and implemented stage definition