Added more to main builder flow