Improve product building.