Added fields to be compatible with OVRA mapping - done with Simon