Changing way of retrieving locations