Changes to Modules, OccurrencesList, InventorPersistenceManager