Improve callback signature
WIP
WIP
WIP
WIP