Added a feature selector