Updated to shared builder