Add callback param

Depedends on #35