Updated to handle new ArcGIS 'on' style events