Improve text analyzer