Use old commentary mappings