Modification 2: Intelligent Feature name recognition
Continue here: