Improve callback signature
WIP