Refactoring the SaGa events to use eventMDOs