add multiple mappings improvement