Index: /trunk/modules/vci_block_device_tsar/caba/metadata/vci_block_device_tsar.sd
===================================================================
--- /trunk/modules/vci_block_device_tsar/caba/metadata/vci_block_device_tsar.sd	(revision 19)
+++ /trunk/modules/vci_block_device_tsar/caba/metadata/vci_block_device_tsar.sd	(revision 20)
@@ -39,5 +39,5 @@
 	'dsx:addressable=tgtid',
 	'dsx:max_segments=1',
-	'dsx:get_ident=tgtid:p_vci_target,srcid:p_vci_initiator',
+	'dsx:get_ident=tgtid:p_vci_target:mt,srcid:p_vci_initiator:mt',
    ],
 )
Index: /trunk/modules/vci_block_device_tsar_v2/caba/metadata/vci_block_device_tsar_v2.sd
===================================================================
--- /trunk/modules/vci_block_device_tsar_v2/caba/metadata/vci_block_device_tsar_v2.sd	(revision 19)
+++ /trunk/modules/vci_block_device_tsar_v2/caba/metadata/vci_block_device_tsar_v2.sd	(revision 20)
@@ -39,5 +39,5 @@
 	'dsx:addressable=tgtid',
 	'dsx:max_segments=1',
-	'dsx:get_ident=tgtid:p_vci_target,srcid:p_vci_initiator',
+	'dsx:get_ident=tgtid:p_vci_target:mt,srcid:p_vci_initiator:mt',
    ],
 )
Index: /trunk/modules/vci_cc_vcache_wrapper2/caba/metadata/vci_cc_vcache_wrapper2.sd
===================================================================
--- /trunk/modules/vci_cc_vcache_wrapper2/caba/metadata/vci_cc_vcache_wrapper2.sd	(revision 19)
+++ /trunk/modules/vci_cc_vcache_wrapper2/caba/metadata/vci_cc_vcache_wrapper2.sd	(revision 20)
@@ -35,6 +35,6 @@
 	instance_parameters = [
 	parameter.Int('proc_id'),
-	parameter.Module('mt', 'common:mapping_table', auto='env:mapping_table'),
-	parameter.Module('mc', 'common:mapping_table', auto='env:mapping_table'),
+	parameter.Module('mt', 'common:mapping_table'),
+	parameter.Module('mc', 'common:mapping_table'),
 	parameter.IntTab('initiator_index'),
 	parameter.IntTab('target_index'),
@@ -52,6 +52,10 @@
 	],
 	   extensions = [
-	'dsx:get_ident=initiator_index:p_vci_ini',
+	'dsx:get_ident='
+        'initiator_index:p_vci_ini:mt,'
+        'target_index:p_vci_tgt:mc',
 	'dsx:cpu=wrapper:iss_t',
+	'dsx:addressable=target_index',
+    'dsx:on_segment=mc:add_index:initiator_index',
 	'dsx:mapping_type=processor:proc_id',
    ],
Index: /trunk/modules/vci_cc_vcache_wrapper2_multi/caba/metadata/vci_cc_vcache_wrapper2_multi.sd
===================================================================
--- /trunk/modules/vci_cc_vcache_wrapper2_multi/caba/metadata/vci_cc_vcache_wrapper2_multi.sd	(revision 19)
+++ /trunk/modules/vci_cc_vcache_wrapper2_multi/caba/metadata/vci_cc_vcache_wrapper2_multi.sd	(revision 20)
@@ -36,6 +36,6 @@
 	instance_parameters = [
 	parameter.Int('proc_id'),
-	parameter.Module('mt', 'common:mapping_table', auto='env:mapping_table'),
-	parameter.Module('mc', 'common:mapping_table', auto='env:mapping_table'),
+	parameter.Module('mt', 'common:mapping_table'),
+	parameter.Module('mc', 'common:mapping_table'),
 	parameter.IntTab('initiator_rw_index'),
 	parameter.IntTab('initiator_c_index'),
@@ -55,6 +55,11 @@
 	],
 	   extensions = [
-	'dsx:get_ident=initiator_index:p_vci_ini_rw',
+	'dsx:get_ident='
+        'initiator_rw_index:p_vci_ini_rw:mt,'
+        'initiator_c_index:p_vci_ini_c:mc,'
+        'target_index:p_vci_tgt:mc',
 	'dsx:cpu=wrapper:iss_t',
+	'dsx:addressable=target_index',
+    'dsx:on_segment=mc:add_index:initiator_rw_index',
 	'dsx:mapping_type=processor:proc_id',
    ],
Index: /trunk/modules/vci_cc_vcache_wrapper2_ring/caba/metadata/vci_cc_vcache_wrapper2_ring.sd
===================================================================
--- /trunk/modules/vci_cc_vcache_wrapper2_ring/caba/metadata/vci_cc_vcache_wrapper2_ring.sd	(revision 19)
+++ /trunk/modules/vci_cc_vcache_wrapper2_ring/caba/metadata/vci_cc_vcache_wrapper2_ring.sd	(revision 20)
@@ -36,5 +36,5 @@
 	instance_parameters = [
 	parameter.Int('proc_id'),
-	parameter.Module('mt', 'common:mapping_table', auto='env:mapping_table'),
+	parameter.Module('mt', 'common:mapping_table'),
 	parameter.IntTab('initiator_rw_index'),
 	parameter.IntTab('initiator_c_index'),
@@ -53,6 +53,11 @@
 	],
 	   extensions = [
-	'dsx:get_ident=initiator_index:p_vci_ini_rw',
+	'dsx:get_ident='
+        'initiator_rw_index:p_vci_ini_rw:mt,'
+        'initiator_c_index:p_vci_ini_c:mt,'
+        'target_index:p_vci_tgt:mt',
 	'dsx:cpu=wrapper:iss_t',
+	'dsx:addressable=target_index',
+    'dsx:on_segment=mc:add_index:initiator_rw_index',
 	'dsx:mapping_type=processor:proc_id',
    ],
Index: /trunk/modules/vci_cc_vcache_wrapper2_v1/caba/metadata/vci_cc_vcache_wrapper2_v1.sd
===================================================================
--- /trunk/modules/vci_cc_vcache_wrapper2_v1/caba/metadata/vci_cc_vcache_wrapper2_v1.sd	(revision 19)
+++ /trunk/modules/vci_cc_vcache_wrapper2_v1/caba/metadata/vci_cc_vcache_wrapper2_v1.sd	(revision 20)
@@ -36,6 +36,6 @@
 	instance_parameters = [
 	parameter.Int('proc_id'),
-	parameter.Module('mt', 'common:mapping_table', auto='env:mapping_table'),
-	parameter.Module('mc', 'common:mapping_table', auto='env:mapping_table'),
+	parameter.Module('mt', 'common:mapping_table'),
+	parameter.Module('mc', 'common:mapping_table'),
 	parameter.IntTab('initiator_rw_index'),
 	parameter.IntTab('initiator_c_index'),
@@ -54,6 +54,11 @@
 	],
 	   extensions = [
-	'dsx:get_ident=initiator_index:p_vci_ini_rw',
+	'dsx:get_ident='
+        'initiator_rw_index:p_vci_ini_rw:mt,'
+        'initiator_c_index:p_vci_ini_c:mc,'
+        'target_index:p_vci_tgt:mc',
 	'dsx:cpu=wrapper:iss_t',
+	'dsx:addressable=target_index',
+    'dsx:on_segment=mc:add_index:initiator_rw_index',
 	'dsx:mapping_type=processor:proc_id',
    ],
Index: /trunk/modules/vci_cc_xcache_wrapper/caba/metadata/vci_cc_xcache_wrapper.sd
===================================================================
--- /trunk/modules/vci_cc_xcache_wrapper/caba/metadata/vci_cc_xcache_wrapper.sd	(revision 19)
+++ /trunk/modules/vci_cc_xcache_wrapper/caba/metadata/vci_cc_xcache_wrapper.sd	(revision 20)
@@ -33,7 +33,7 @@
 	instance_parameters = [
 		parameter.Int('proc_id'),
-		parameter.Module('mt', 'common:mapping_table', auto='env:mapping_table'),
+		parameter.Module('mt', 'common:mapping_table'),
 		parameter.IntTab('initiator_index'),
-		parameter.IntTab('target_indext'),
+		parameter.IntTab('target_index'),
 		parameter.Int('icache_ways'),
 		parameter.Int('icache_sets'),
@@ -44,8 +44,12 @@
 		],
 	   extensions = [
-		'dsx:get_ident=initiator_index:p_vci_ini',
-		'dsx:cpu=wrapper:iss_t',
-		'dsx:mapping_type=processor:proc_id',
-		],
+	'dsx:get_ident='
+        'initiator_index:p_vci_ini:mc,'
+        'target_index:p_vci_tgt:mc',
+	'dsx:cpu=wrapper:iss_t',
+	'dsx:addressable=target_index',
+    'dsx:on_segment=mc:add_index:initiator_index',
+	'dsx:mapping_type=processor:proc_id',
+   ],
 )
 
Index: /trunk/modules/vci_cc_xcache_wrapper_multi/caba/metadata/vci_cc_xcache_wrapper_multi.sd
===================================================================
--- /trunk/modules/vci_cc_xcache_wrapper_multi/caba/metadata/vci_cc_xcache_wrapper_multi.sd	(revision 19)
+++ /trunk/modules/vci_cc_xcache_wrapper_multi/caba/metadata/vci_cc_xcache_wrapper_multi.sd	(revision 20)
@@ -26,5 +26,5 @@
 	ports = [
 		Port('caba:vci_initiator', 'p_vci_ini_d'),
-    Port('caba:vci_initiator', 'p_vci_ini_c'),
+        Port('caba:vci_initiator', 'p_vci_ini_c'),
 		Port('caba:vci_target', 'p_vci_tgt'),
 		Port('caba:bit_in', 'p_irq', parameter.Constant('n_irq')),
@@ -49,8 +49,13 @@
 		],
 	   extensions = [
-		'dsx:get_ident=initiator_index:p_vci_ini_rw',
-		'dsx:cpu=wrapper:iss_t',
-		'dsx:mapping_type=processor:proc_id',
-		],
+	'dsx:get_ident='
+        'initiator_rw_index:p_vci_ini_d:mt,'
+        'initiator_c_index:p_vci_ini_c:mc,'
+        'target_index:p_vci_tgt:mc',
+	'dsx:cpu=wrapper:iss_t',
+	'dsx:addressable=target_index',
+    'dsx:on_segment=mc:add_index:initiator_rw_index',
+	'dsx:mapping_type=processor:proc_id',
+   ],
 )
 
Index: /trunk/modules/vci_cc_xcache_wrapper_v1/caba/metadata/vci_cc_xcache_wrapper_v1.sd
===================================================================
--- /trunk/modules/vci_cc_xcache_wrapper_v1/caba/metadata/vci_cc_xcache_wrapper_v1.sd	(revision 19)
+++ /trunk/modules/vci_cc_xcache_wrapper_v1/caba/metadata/vci_cc_xcache_wrapper_v1.sd	(revision 20)
@@ -47,8 +47,13 @@
 		],
 	   extensions = [
-		'dsx:get_ident=initiator_index:p_vci_ini_rw',
-		'dsx:cpu=wrapper:iss_t',
-		'dsx:mapping_type=processor:proc_id',
-		],
+	'dsx:get_ident='
+        'initiator_rw_index:p_vci_ini_rw:mt,'
+        'initiator_c_index:p_vci_ini_c:mc,'
+        'target_index:p_vci_tgt:mc',
+	'dsx:cpu=wrapper:iss_t',
+	'dsx:addressable=target_index',
+    'dsx:on_segment=mc:add_index:initiator_rw_index',
+	'dsx:mapping_type=processor:proc_id',
+   ],
 )
 
Index: /trunk/modules/vci_cc_xcache_wrapper_v4/caba/metadata/vci_cc_xcache_wrapper_v4.sd
===================================================================
--- /trunk/modules/vci_cc_xcache_wrapper_v4/caba/metadata/vci_cc_xcache_wrapper_v4.sd	(revision 19)
+++ /trunk/modules/vci_cc_xcache_wrapper_v4/caba/metadata/vci_cc_xcache_wrapper_v4.sd	(revision 20)
@@ -26,5 +26,5 @@
 	ports = [
 		Port('caba:vci_initiator', 'p_vci_ini_rw'),
-    Port('caba:vci_initiator', 'p_vci_ini_c'),
+        Port('caba:vci_initiator', 'p_vci_ini_c'),
 		Port('caba:vci_target', 'p_vci_tgt'),
 		Port('caba:bit_in', 'p_irq', parameter.Constant('n_irq')),
@@ -47,8 +47,13 @@
 		],
 	   extensions = [
-		'dsx:get_ident=initiator_index:p_vci_ini_rw',
-		'dsx:cpu=wrapper:iss_t',
-		'dsx:mapping_type=processor:proc_id',
-		],
+	'dsx:get_ident='
+        'initiator_rw_index:p_vci_ini_rw:mt,'
+        'initiator_c_index:p_vci_ini_c:mc,'
+        'target_index:p_vci_tgt:mc',
+	'dsx:cpu=wrapper:iss_t',
+	'dsx:addressable=target_index',
+    'dsx:on_segment=mc:add_index:initiator_rw_index',
+	'dsx:mapping_type=processor:proc_id',
+   ],
 )
 
Index: /trunk/modules/vci_dma_tsar/caba/metadata/vci_dma_tsar.sd
===================================================================
--- /trunk/modules/vci_dma_tsar/caba/metadata/vci_dma_tsar.sd	(revision 19)
+++ /trunk/modules/vci_dma_tsar/caba/metadata/vci_dma_tsar.sd	(revision 20)
@@ -39,5 +39,5 @@
 	'dsx:addressable=tgtid',
 	'dsx:max_segments=1',
-	'dsx:get_ident=srcid:p_vci_target,tgtid:p_vci_initiator',
+	'dsx:get_ident=tgtid:p_vci_target:mt,srcid:p_vci_initiator:mt',
    ],
 )
Index: /trunk/modules/vci_dma_tsar_v2/caba/metadata/vci_dma_tsar_v2.sd
===================================================================
--- /trunk/modules/vci_dma_tsar_v2/caba/metadata/vci_dma_tsar_v2.sd	(revision 19)
+++ /trunk/modules/vci_dma_tsar_v2/caba/metadata/vci_dma_tsar_v2.sd	(revision 20)
@@ -39,5 +39,5 @@
 	'dsx:addressable=tgtid',
 	'dsx:max_segments=1',
-	'dsx:get_ident=srcid:p_vci_target,tgtid:p_vci_initiator',
+	'dsx:get_ident=tgtid:p_vci_target:mt,srcid:p_vci_initiator:mt',
    ],
 )
Index: /trunk/modules/vci_local_ring_network_2/caba/metadata/vci_local_ring_network_2.sd
===================================================================
--- /trunk/modules/vci_local_ring_network_2/caba/metadata/vci_local_ring_network_2.sd	(revision 19)
+++ /trunk/modules/vci_local_ring_network_2/caba/metadata/vci_local_ring_network_2.sd	(revision 20)
@@ -24,5 +24,5 @@
 	],
 	instance_parameters = [
-		parameter.Module('mt', 'common:mapping_table', auto='env:mapping_table'),
+		parameter.Module('mt', 'common:mapping_table'),
 	        parameter.IntTab('ringid'),
                 parameter.Int('wrapper_fifo_depth'),
Index: /trunk/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd
===================================================================
--- /trunk/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd	(revision 19)
+++ /trunk/modules/vci_mem_cache/caba/metadata/vci_mem_cache.sd	(revision 20)
@@ -20,7 +20,6 @@
                ],
        ports = [Port('caba:vci_target', 'p_vci_tgt'),
-		Port('caba:vci_initiator','p_vci_init'),
+                Port('caba:vci_initiator','p_vci_init'),
                 Port('caba:bit_in', 'p_resetn', auto = 'resetn'),
                 Port('caba:clock_in', 'p_clk', auto = 'clock'),],
-       extensions = ['dsx:get_ident=ident:p_vci',],
 )
Index: /trunk/modules/vci_mem_cache_v1/caba/metadata/vci_mem_cache_v1.sd
===================================================================
--- /trunk/modules/vci_mem_cache_v1/caba/metadata/vci_mem_cache_v1.sd	(revision 19)
+++ /trunk/modules/vci_mem_cache_v1/caba/metadata/vci_mem_cache_v1.sd	(revision 20)
@@ -37,4 +37,11 @@
 		parameter.Int('nwords'),
 		],
-       extensions = ['dsx:get_ident=initiator_index:p_vci_ini',],
+       extensions = [
+          'dsx:get_ident='
+          'vci_ini_index:p_vci_ini:mtc,'
+          'vci_tgt_index_cleanup:p_vci_tgt_cleanup:mtc,'
+          'vci_tgt_index:p_vci_tgt:mtp,'
+          'vci_ixr_index:p_vci_ixr:mtx',
+		'dsx:addressable=vci_tgt_index,vci_tgt_index_cleanup',
+       ],
 )
Index: /trunk/modules/vci_mem_cache_v2/caba/metadata/vci_mem_cache_v2.sd
===================================================================
--- /trunk/modules/vci_mem_cache_v2/caba/metadata/vci_mem_cache_v2.sd	(revision 19)
+++ /trunk/modules/vci_mem_cache_v2/caba/metadata/vci_mem_cache_v2.sd	(revision 20)
@@ -37,4 +37,11 @@
 		parameter.Int('nwords'),
 		],
-       extensions = ['dsx:get_ident=initiator_index:p_vci_ini',],
+       extensions = [
+          'dsx:get_ident='
+          'vci_ini_index:p_vci_ini:mtc,'
+          'vci_tgt_index_cleanup:p_vci_tgt_cleanup:mtc,'
+          'vci_tgt_index:p_vci_tgt:mtp,'
+          'vci_ixr_index:p_vci_ixr:mtx',
+		'dsx:addressable=vci_tgt_index,vci_tgt_index_cleanup',
+       ],
 )
Index: /trunk/modules/vci_mem_cache_v3/caba/metadata/vci_mem_cache_v3.sd
===================================================================
--- /trunk/modules/vci_mem_cache_v3/caba/metadata/vci_mem_cache_v3.sd	(revision 19)
+++ /trunk/modules/vci_mem_cache_v3/caba/metadata/vci_mem_cache_v3.sd	(revision 20)
@@ -38,4 +38,11 @@
 		parameter.Int('heap_size'),
 		],
-       extensions = ['dsx:get_ident=initiator_index:p_vci_ini',],
+       extensions = [
+          'dsx:get_ident='
+          'vci_ini_index:p_vci_ini:mtc,'
+          'vci_tgt_index_cleanup:p_vci_tgt_cleanup:mtc,'
+          'vci_tgt_index:p_vci_tgt:mtp,'
+          'vci_ixr_index:p_vci_ixr:mtx',
+		'dsx:addressable=vci_tgt_index,vci_tgt_index_cleanup',
+       ],
 )
Index: /trunk/modules/vci_mem_cache_v4/caba/metadata/vci_mem_cache_v4.sd
===================================================================
--- /trunk/modules/vci_mem_cache_v4/caba/metadata/vci_mem_cache_v4.sd	(revision 19)
+++ /trunk/modules/vci_mem_cache_v4/caba/metadata/vci_mem_cache_v4.sd	(revision 20)
@@ -37,4 +37,11 @@
 		parameter.Int('heap_size'),
 		],
-       extensions = ['dsx:get_ident=initiator_index:p_vci_ini',],
+       extensions = [
+          'dsx:get_ident='
+          'vci_ini_index:p_vci_ini:mtc,'
+          'vci_tgt_index_cleanup:p_vci_tgt_cleanup:mtc,'
+          'vci_tgt_index:p_vci_tgt:mtp,'
+          'vci_ixr_index:p_vci_ixr:mtx',
+		'dsx:addressable=vci_tgt_index,vci_tgt_index_cleanup',
+       ],
 )
Index: /trunk/modules/vci_simple_ring_network_2/caba/metadata/vci_simple_ring_network_2.sd
===================================================================
--- /trunk/modules/vci_simple_ring_network_2/caba/metadata/vci_simple_ring_network_2.sd	(revision 19)
+++ /trunk/modules/vci_simple_ring_network_2/caba/metadata/vci_simple_ring_network_2.sd	(revision 20)
@@ -21,5 +21,5 @@
 	],
 	instance_parameters = [
-		parameter.Module('mt', 'common:mapping_table', auto='env:mapping_table'),
+		parameter.Module('mt', 'common:mapping_table'),
 	        parameter.IntTab('ringid'),
                 parameter.Int('wrapper_fifo_depth'),