Added flexible feature selector