2.x client updates