Added additional extractors