New build logic