Add emoticon support