Enhanced callback support