Make FeatureValue a union