[canalplus] Improve and merge with d8 extractor