Dbal config restructure
Updates TODO