Added a handler for the creation callback