Added some work to the BDS extension