Break up middleware
Add plugin suffix to stat instrumentation