make adding of mappings automatic