Revise the definition of callbacks