Refactored & extended BDT API