Removed legacy BC api dependence