Esri Support

Should be good to go! ESRI sources are handled separately from typical sources and the code reflects this change.