Started upgrade to support SS 3.x