Updated callback API
Clean-up