Added the callback proxy