For #98 switched builder to a fluent interface