Transition to shared builder