Added support for more builder properties