Removed flag field from SampleFeatureValues, added sample_unit to them