[Transitions] - Reworked to make extension easier