Added better Devanagari handling