Added on rotation retain, history stack and contract tracker