add x-hints and dataURL support