Added callback handling.