adding mappings logic