Added new module definitions and initial event handling schema.