Improved request handling in MS