Modified packages to match persistence files