Added address mappings to make geocoders equivalent