Update for the new Servant