EventOccurrence functionality - uncompleted changes