refs #1: Prepare for callback handling