Added Mood model and improved integration