Added builder pattern generation support - checked in sample models.yml