Callback enhancement