Changes for v2.0.0 Phase-II