Add XHR support