[tvp] Improve and add new extractor