Bug fix: validator now checks measurement_type