Updated how DB works with new YAML settigns