Add support for DBT and MWV