Builder improvements