Use location instead of address string