Wrap handlers with middleware when adding
Merged