Functionality added to the persistence layer
Merge origin/master