new db structure for processing
Merge remote-tracking branch 'origin/master'