Added SuperCaller functionality to all event mappings