Further enhancements to Transition