Adding XFF support