Extracted middleware to addons

For the purpose of other middleware injecting before/after named
middleware