Renamed builder to wagon