Added text normalization support