Efficiency improvements in transition manager