Preparing for more bdos calls