Update BuilderController.java and BuilderModel.java