Use MultipartEntityBuilder instead of deprecated methods