Better callbacks support