Added punctuation support