This should be added to ADAMRecordField as well