Improving location management