Added Emotions Support