Interfaces matched to the Database
Merge branch 'Persistence_Branch'