Improved fluent builder interface