Replace PackageType with ItemType