improve - add more builder parameters