add extractor support (implementation not perfect yet)