data model refactor - event data still broken