Add callbacks to demo + doc design