add data for emotion analysis and some refactor