Better support for persisting data