Improving DB mappings
Merge branch 'dev'