Builder changes