ESRI - Port to new infrastructure