Better cdn support