Updated to reflect BDS changes