Added support for HW P/N