Fix config file madness

Change-Id: I098a6c9bf86460cae6b5dc24e7e4178e4e53e9ff
add db modeling

Change-Id: I0c61e107279765f2a1318fc8477e7f3a5d92b938