Improve Persistence Layer