CairoTraffic code updates