Added more builder properties with code