Updated callback method