Updated callbacks section