Enhanced callbacks