Added Emoji support