Re-added Esri tools.