make creation of persistent store self contained