Adjust order of processing, fallback to SQLite
Replace TDS with BDL