Updates to Machine Inventory to support GeneralInformation section