work on extractors, optional field fix