Add missing db indexes
Update db schema