Update shell connector to work with event types - no more exception being raised