Modify post request handling