Merged fixing issues
Orginized db configs