[HSA-676 Fix] Enhance Callback Interface