Add execute hook to allow wrapping handler calls