Sync servo type change
More changes related to changing servo type