Localizing more endpoints