Add support for emoticons