Added more builder functionality