Revised callback signature