Changed implementation structure for StorageUnit and ProductGroup