Updates to ensure default context events are mapped and initialized