WMS to use new build structure.