New branch
Merge branch 'new_db_scheme'