[FIX/FEATURE] extending feature analysis