Redefine event data structure