Update Vmap extractor to work with 5.3.0 17128