Simplify data persistence module.