Add new EventRecommender code with change from Annika