EventState shouldn't be global