Updated LocationUtils