further updates to Event Grid Adapter