Added a condition in `_metric_fields` so that it only records fields which are set. This means that `_retrieve` will always have the model class tag, but shouldn't have anything else.