Implement changes required for external location lookups