Added some more variables to Event