Updated htttp implementation