Added logging to the middleware, improved it