Added support for middleware, organized code
Add support for helpers