Updated to remove one more BDB dependency