Complete updates for v2.x of service layer