Updated persistence to conform to namespaces.