Removed direct BJY dependency