Updates to make BD more explicit