Final BDMS changes