Optimize handler calls