Updated callbacks