Removed reference to event entity