little DRY changes
Merge branch 'Persistence_Branch'