Move WithBuilder to main side #486