Added Proper Middleware