Added additional data parameter to event callback