Added FeatureSet supports