Make private extend function in event-map simpler