CORE-4876: Updated Callback converter