Added some changes to Middleware.