A few changes to send more information to the handlers.