More work on UnitConstruction