Update extractors and mapping methods.
Bug fixes in relabelling and reordering functions