Add database persistence
Merge origin/bvu into bvu