Improve morphological analysis