Added additional data to callbacks