Enhance: Reconstruct Servant