Port to split BL API
Fix incorrect import
Function restructure