Changes for 1.x version