Restore executor dispatch
Support removal listener