Complete reformulation of class Servo