Replaced EFGraph with BVGraph