PROBCORE-404 Changed Event elements so that they have a reference to their parent event