Improve request body parser