Adding Servant Design pattern classes