Added support for re-use of part number