Partial changes for Servo class redefinition