Save original keywords in addition to YSO mappings