Fixed database persistence issues in my environment while maintaining relativity. Please test on your own environments.