Refactor and add several more extractors