Raccoon/core-persistence