Added extra smiley support