Finishing migrating to new callback pattern