Added DelegatingMapTrigger