More comprehensive text-object mappings