adding voldemort bnp support