Updated the event model. Modified everything accordingly.