Generalized the feature set