Addition of @fires and moving @event to beginning of modules