Ensure that extra_fields are set before processing
Better processing of plugins data