Improve handling of request data