Optional callback and export it
Add API