Generic Restricted Values and VolCal working