Improvements to callbacks