Add values when returning annotatedValues for legacy client purposes