Location functionality updated