Added additional features into emotion