Move to a persistent hash map