1. Updated callback set logic