Changed PropertySelectors to FeatureSelectors