Changed the way to create Builder instances