More improvements on Smart HTTP