* Add fuzzy mapping with comments