Improved callbacks support.