Additions to Persistence Layer