Adopting to URI changes