Added unmarshaller event handler