Add existing measures for possible use in calibration

I'll update these to have the machine readable attributes needed for
calibration.