Updated extractors to use new libs.