Changes to the persistence module to make identification clearer and to expose the functionality properly