Updated to include http encoder/decoder