Updated with changes made in the dbtv front repo