big changes for httpstream integration