Use the Builder pattern more correctly