MessageGenerator now nested classes named Builder