Callback updates for v1+