Add change location handling