Added code to generate builders