Add more callback hooks