more bnd support