new db config
Merge 2.0