diff --git a/libraries/base/common/hdllib.cfg b/libraries/base/common/hdllib.cfg
index 7782f3706bb5e020e609abc21628648f312c741d..e57b61685d6252362dccae86554c6d9d521fe2af 100644
--- a/libraries/base/common/hdllib.cfg
+++ b/libraries/base/common/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = common
 hdl_library_clause_name = common_lib
-hdl_lib_uses = technology tech_memory tech_fifo tech_iobuf tst
+hdl_lib_uses_synth = technology tech_memory tech_fifo tech_iobuf tst
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/base/diag/hdllib.cfg b/libraries/base/diag/hdllib.cfg
index c1777737080635ab9b64d303d123704991d41183..0708b3562832d415df4c98dd71e2d671663f8bc3 100644
--- a/libraries/base/diag/hdllib.cfg
+++ b/libraries/base/diag/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = diag
 hdl_library_clause_name = diag_lib
-hdl_lib_uses = dp common
+hdl_lib_uses_synth = dp common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/base/diagnostics/hdllib.cfg b/libraries/base/diagnostics/hdllib.cfg
index b87bc14b5b5cdb45921b9b204e0392c7ef76856f..b3538c5761a82ae38db0138815f5fe338ead6b5a 100644
--- a/libraries/base/diagnostics/hdllib.cfg
+++ b/libraries/base/diagnostics/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = diagnostics
 hdl_library_clause_name = diagnostics_lib
-hdl_lib_uses = common dp diag
+hdl_lib_uses_synth = common dp diag
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/base/dp/hdllib.cfg b/libraries/base/dp/hdllib.cfg
index 3e324fa00aa13de0005c0c43a0ff179312eec14b..6cac266f1c83c371d191ef7fca69a254a6524cc6 100644
--- a/libraries/base/dp/hdllib.cfg
+++ b/libraries/base/dp/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = dp
 hdl_library_clause_name = dp_lib
-hdl_lib_uses = mm common easics
+hdl_lib_uses_synth = mm common easics
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/base/mm/hdllib.cfg b/libraries/base/mm/hdllib.cfg
index 8692715ab7f0d90fd0b765e9c95ecfec5f00cf5d..7ec4d76385567c07bba56728b72bce0737081d33 100644
--- a/libraries/base/mm/hdllib.cfg
+++ b/libraries/base/mm/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = mm
 hdl_library_clause_name = mm_lib
-hdl_lib_uses = common
+hdl_lib_uses_synth = common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/base/reorder/hdllib.cfg b/libraries/base/reorder/hdllib.cfg
index 046a8140b91c9bb1f35c8b4559d1bfa526a8cc12..61d0f05a60cf84a5df72136f25ad8e76103f4178 100644
--- a/libraries/base/reorder/hdllib.cfg
+++ b/libraries/base/reorder/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = reorder
 hdl_library_clause_name = reorder_lib
-hdl_lib_uses = common dp io_ddr tech_ddr
+hdl_lib_uses_synth = common dp io_ddr tech_ddr
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/base/sens/hdllib.cfg b/libraries/base/sens/hdllib.cfg
index 76b7056aa2eb8cc36d93c06298654e622c7e1436..fad7a603df46d6fe9be941d2f43a47940c6cc1e9 100644
--- a/libraries/base/sens/hdllib.cfg
+++ b/libraries/base/sens/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = sens
 hdl_library_clause_name = sens_lib
-hdl_lib_uses = common i2c
+hdl_lib_uses_synth = common i2c
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/base/tst/hdllib.cfg b/libraries/base/tst/hdllib.cfg
index da5e50750568ef729ef6be7efe892e7b399736a7..0570982ab6177473dd8695a1cbd336a840664ea3 100644
--- a/libraries/base/tst/hdllib.cfg
+++ b/libraries/base/tst/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tst
 hdl_library_clause_name = tst_lib
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/base/uth/hdllib.cfg b/libraries/base/uth/hdllib.cfg
index 61353c203cde86518279d366c08cc76a66ea7295..62652855023e62817ecb0fcf540127716715a83f 100644
--- a/libraries/base/uth/hdllib.cfg
+++ b/libraries/base/uth/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = uth
 hdl_library_clause_name = uth_lib
-hdl_lib_uses = common dp easics
+hdl_lib_uses_synth = common dp easics
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/dsp/bf/hdllib.cfg b/libraries/dsp/bf/hdllib.cfg
index 035ac89813aff3f01e079cc099c8bc00e93dfbb9..9200b4079c70954d10b3c025c2ae953565002d93 100644
--- a/libraries/dsp/bf/hdllib.cfg
+++ b/libraries/dsp/bf/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = bf
 hdl_library_clause_name = bf_lib
-hdl_lib_uses = common mm dp diag st reorder
+hdl_lib_uses_synth = common mm dp diag st reorder
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg b/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
index d335c02c25f8e73f6b0355372ff1c3cc92d00468..235a94993d21105ea64963fa4ba9328fcffc548d 100644
--- a/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
+++ b/libraries/dsp/correlator/designs/unb1_correlator/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_correlator
 hdl_library_clause_name = unb1_correlator_lib
-hdl_lib_uses = common mm i2c unb1_board correlator 
+hdl_lib_uses_synth = common mm i2c unb1_board correlator 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/dsp/correlator/hdllib.cfg b/libraries/dsp/correlator/hdllib.cfg
index 6f17949c0e4323c9cbded897aae9b0e41ff7d73d..7404455df5d5209d2d82176a3a07b1204df9437a 100644
--- a/libraries/dsp/correlator/hdllib.cfg
+++ b/libraries/dsp/correlator/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = correlator
 hdl_library_clause_name = correlator_lib
-hdl_lib_uses = common dp diag
+hdl_lib_uses_synth = common dp diag
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/dsp/fft/hdllib.cfg b/libraries/dsp/fft/hdllib.cfg
index 74b137c853c0638acc78d32ef8becda67884a782..408290f5c844837304f4664823dc2b56e20dd692 100644
--- a/libraries/dsp/fft/hdllib.cfg
+++ b/libraries/dsp/fft/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = fft
 hdl_library_clause_name = fft_lib
-hdl_lib_uses = common mm dp diag rTwoSDF st
+hdl_lib_uses_synth = common mm dp diag rTwoSDF st
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/dsp/filter/hdllib.cfg b/libraries/dsp/filter/hdllib.cfg
index c061f6f4d25163be480f16bc0a1e04ebcacbc78d..0c4b4c52ab52a3e20ed8eaaa2df9aa42b8647401 100644
--- a/libraries/dsp/filter/hdllib.cfg
+++ b/libraries/dsp/filter/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = filter
 hdl_library_clause_name = filter_lib
-hdl_lib_uses = common dp diag
+hdl_lib_uses_synth = common dp diag
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/dsp/rTwoSDF/hdllib.cfg b/libraries/dsp/rTwoSDF/hdllib.cfg
index 97403210a01116d87e16eb8b0cfd006e6dfe4d0b..3614eceb0ea350618b65e3ad32113b879690cc55 100644
--- a/libraries/dsp/rTwoSDF/hdllib.cfg
+++ b/libraries/dsp/rTwoSDF/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = rTwoSDF
 hdl_library_clause_name = rTwoSDF_lib
-hdl_lib_uses = common
+hdl_lib_uses_synth = common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/dsp/st/hdllib.cfg b/libraries/dsp/st/hdllib.cfg
index bde28bbed2f767b93d1c6c1faa522de836c20aa3..c019576ea9ae56696fa17f13419b8222b574c7c0 100644
--- a/libraries/dsp/st/hdllib.cfg
+++ b/libraries/dsp/st/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = st
 hdl_library_clause_name = st_lib
-hdl_lib_uses = common mm dp diag
+hdl_lib_uses_synth = common mm dp diag
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/dsp/wpfb/hdllib.cfg b/libraries/dsp/wpfb/hdllib.cfg
index 7abdc25294acb241f7ae0fab22303558be222b3d..4e596da29f7a4a311783eeb49e74e303f53677a5 100644
--- a/libraries/dsp/wpfb/hdllib.cfg
+++ b/libraries/dsp/wpfb/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = wpfb
 hdl_library_clause_name = wpfb_lib
-hdl_lib_uses = common mm diag dp rTwoSDF st fft filter
+hdl_lib_uses_synth = common mm diag dp rTwoSDF st fft filter
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/external/easics/hdllib.cfg b/libraries/external/easics/hdllib.cfg
index 8675630267743ca096b644010ab605ac284042b7..296625546b80d1dec43b0bc428082ba94b2f43bc 100644
--- a/libraries/external/easics/hdllib.cfg
+++ b/libraries/external/easics/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = easics
 hdl_library_clause_name = easics_lib
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/external/numonyx_m25p128/hdllib.cfg b/libraries/external/numonyx_m25p128/hdllib.cfg
index e8fb221b646fefa5b6069e23546a523c3e72c256..eae83f538e06be1f315c994269e00f01844d6215 100644
--- a/libraries/external/numonyx_m25p128/hdllib.cfg
+++ b/libraries/external/numonyx_m25p128/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = numonyx_m25p128
 hdl_library_clause_name = numonyx_m25p128_lib
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/ddr/hdllib.cfg b/libraries/io/ddr/hdllib.cfg
index e50efbb9fec458cee62e838dc64c846689f156ee..35519ad26af0355947a8f116f5272770cf714d1a 100644
--- a/libraries/io/ddr/hdllib.cfg
+++ b/libraries/io/ddr/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = io_ddr
 hdl_library_clause_name = io_ddr_lib
-hdl_lib_uses = technology tech_ddr tech_ddr3 common dp diagnostics 
+hdl_lib_uses_synth = technology tech_ddr tech_ddr3 common dp diagnostics 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
@@ -25,10 +27,10 @@ modelsim_search_libraries =
 #    altera_ver lpm_ver sgate_ver altera_mf_ver altera_lnsim_ver stratixiv_ver stratixiv_hssi_ver stratixiv_pcie_hip_ver
 #    altera     lpm     sgate     altera_mf     altera_lnsim     stratixiv     stratixiv_hssi     stratixiv_pcie_hip
 # arria10 only
-#    altera_ver lpm_ver sgate_ver altera_mf_ver altera_lnsim_ver twentynm_ver twentynm_hssi_ver twentynm_hip_ver
-#    altera     lpm     sgate     altera_mf     altera_lnsim     twentynm     twentynm_hssi     twentynm_hip
+    altera_ver lpm_ver sgate_ver altera_mf_ver altera_lnsim_ver twentynm_ver twentynm_hssi_ver twentynm_hip_ver
+    altera     lpm     sgate     altera_mf     altera_lnsim     twentynm     twentynm_hssi     twentynm_hip
 # both (will yield errors if the technology library is not available in simulator but these errors can be ignored)
-    altera_ver lpm_ver sgate_ver altera_mf_ver altera_lnsim_ver stratixiv_ver stratixiv_hssi_ver stratixiv_pcie_hip_ver twentynm_ver twentynm_hssi_ver twentynm_hip_ver
-    altera     lpm     sgate     altera_mf     altera_lnsim     stratixiv     stratixiv_hssi     stratixiv_pcie_hip     twentynm     twentynm_hssi     twentynm_hip
+#    altera_ver lpm_ver sgate_ver altera_mf_ver altera_lnsim_ver stratixiv_ver stratixiv_hssi_ver stratixiv_pcie_hip_ver twentynm_ver twentynm_hssi_ver twentynm_hip_ver
+#    altera     lpm     sgate     altera_mf     altera_lnsim     stratixiv     stratixiv_hssi     stratixiv_pcie_hip     twentynm     twentynm_hssi     twentynm_hip
 
 
diff --git a/libraries/io/epcs/hdllib.cfg b/libraries/io/epcs/hdllib.cfg
index 9c336b47b7b2274f73b5fcc83fe471c70d2983fe..7a25a1b158c65a094c3b9e6f41564a749bcf560e 100644
--- a/libraries/io/epcs/hdllib.cfg
+++ b/libraries/io/epcs/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = epcs
 hdl_library_clause_name = epcs_lib
-hdl_lib_uses = common dp tech_flash
+hdl_lib_uses_synth = common dp tech_flash
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/eth/hdllib.cfg b/libraries/io/eth/hdllib.cfg
index 6829b8993c415f7086d0efc6cd149b2147008911..f63da4ecc7cfcc6292f883d96d731fc985b0a42d 100644
--- a/libraries/io/eth/hdllib.cfg
+++ b/libraries/io/eth/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = eth
 hdl_library_clause_name = eth_lib
-hdl_lib_uses = dp common tech_tse
+hdl_lib_uses_synth = dp common tech_tse
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/i2c/hdllib.cfg b/libraries/io/i2c/hdllib.cfg
index d911550c2f25fa8d4b510caa14a06abaed48a33f..573eb297548caae802b6b81e380b7c849fd6a244 100644
--- a/libraries/io/i2c/hdllib.cfg
+++ b/libraries/io/i2c/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = i2c
 hdl_library_clause_name = i2c_lib
-hdl_lib_uses = common
+hdl_lib_uses_synth = common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/mac_10g/hdllib.cfg b/libraries/io/mac_10g/hdllib.cfg
index c5bf985935a7c38eb89eea65c0b7d90d78b0912f..5c3fdb71e5f948303cbfc7e03ac8f4ab7666d5af 100644
--- a/libraries/io/mac_10g/hdllib.cfg
+++ b/libraries/io/mac_10g/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = io_mac_10g
 hdl_library_clause_name = io_mac_10g_lib
-hdl_lib_uses = technology tech_mac_10g common dp
+hdl_lib_uses_synth = technology tech_mac_10g common dp
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/mdio/hdllib.cfg b/libraries/io/mdio/hdllib.cfg
index 45d9a2e097a2a52be784c0e7aacfd1f02b1f4a5d..d2651a9d8ca51bffbb1952ce006268eac975a10e 100644
--- a/libraries/io/mdio/hdllib.cfg
+++ b/libraries/io/mdio/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = mdio
 hdl_library_clause_name = mdio_lib
-hdl_lib_uses = common mm
+hdl_lib_uses_synth = common mm
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/ppsh/hdllib.cfg b/libraries/io/ppsh/hdllib.cfg
index 3e213b5063b9f5c9065ba2383f2b5bfa48b5e034..72c1511f504f1f78a80269e516a52bfd803b5db3 100644
--- a/libraries/io/ppsh/hdllib.cfg
+++ b/libraries/io/ppsh/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ppsh
 hdl_library_clause_name = ppsh_lib
-hdl_lib_uses = common
+hdl_lib_uses_synth = common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/remu/hdllib.cfg b/libraries/io/remu/hdllib.cfg
index 1d6d8aa122f9ddb83175215039bf7782cab9d5ae..d836a02b1352193e8c50acd1f20abb6f291add79 100644
--- a/libraries/io/remu/hdllib.cfg
+++ b/libraries/io/remu/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = remu
 hdl_library_clause_name = remu_lib
-hdl_lib_uses = common tech_flash
+hdl_lib_uses_synth = common tech_flash
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/tr_10GbE/hdllib.cfg b/libraries/io/tr_10GbE/hdllib.cfg
index 021cc005932fc42ed7050bb401da46bac0b181d9..5b98241dc8b11c5312cf3e043457ba2c38fb3ea7 100644
--- a/libraries/io/tr_10GbE/hdllib.cfg
+++ b/libraries/io/tr_10GbE/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tr_10GbE
 hdl_library_clause_name = tr_10GbE_lib
-hdl_lib_uses = common technology tech_mac_10g tech_eth_10g tr_xaui dp diag diagnostics
+hdl_lib_uses_synth = common technology tech_mac_10g tech_eth_10g tr_xaui dp diag diagnostics
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/tr_nonbonded/hdllib.cfg b/libraries/io/tr_nonbonded/hdllib.cfg
index e0af42b1e9c58cc582860eb6d4bd3d2c7636002d..5a529edfaa63a60b353b652605a52bd610449718 100644
--- a/libraries/io/tr_nonbonded/hdllib.cfg
+++ b/libraries/io/tr_nonbonded/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tr_nonbonded
 hdl_library_clause_name = tr_nonbonded_lib
-hdl_lib_uses = common dp diag diagnostics tech_transceiver
+hdl_lib_uses_synth = common dp diag diagnostics tech_transceiver
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/io/tr_xaui/hdllib.cfg b/libraries/io/tr_xaui/hdllib.cfg
index 69b750fd05b40f2ba2086f55303dab7b75463991..3cbbb9a327f1947ed8a7fec793d4985ac8eb4ffd 100644
--- a/libraries/io/tr_xaui/hdllib.cfg
+++ b/libraries/io/tr_xaui/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tr_xaui
 hdl_library_clause_name = tr_xaui_lib
-hdl_lib_uses = common dp mdio diagnostics tech_xaui
+hdl_lib_uses_synth = common dp mdio diagnostics tech_xaui
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/10gbase_r/hdllib.cfg b/libraries/technology/10gbase_r/hdllib.cfg
index b98c64e0f13512fafefb82de46b1bee050aee073..075d3af7c0b7d3b917bd5b685ef14c3460ea743e 100644
--- a/libraries/technology/10gbase_r/hdllib.cfg
+++ b/libraries/technology/10gbase_r/hdllib.cfg
@@ -1,12 +1,14 @@
 hdl_lib_name = tech_10gbase_r
 hdl_library_clause_name = tech_10gbase_r_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
                tech_pll
                ip_arria10_phy_10gbase_r
                ip_arria10_transceiver_pll_10g
                ip_arria10_transceiver_reset_controller_1
                tech_transceiver
                common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ddr/hdllib.cfg b/libraries/technology/ddr/hdllib.cfg
index c2831fecdec6567e277ed91960e44abed800d024..bd487ba61fe0f9c7c27776625144577521a4827b 100644
--- a/libraries/technology/ddr/hdllib.cfg
+++ b/libraries/technology/ddr/hdllib.cfg
@@ -1,12 +1,14 @@
 hdl_lib_name = tech_ddr
 hdl_library_clause_name = tech_ddr_lib
-hdl_lib_uses = ip_stratixiv_ddr3_uphy_4g_800_master
+hdl_lib_uses_synth = ip_stratixiv_ddr3_uphy_4g_800_master
                ip_stratixiv_ddr3_uphy_4g_800_slave
                ip_stratixiv_ddr3_mem_model
                ip_arria10_ddr4_4g_1600
                ip_arria10_ddr4_8g_2400
                ip_arria10_ddr4_mem_model_141
                common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/eth_10g/hdllib.cfg b/libraries/technology/eth_10g/hdllib.cfg
index 65a2fcd18c1ff1b7dea5f8aea37cea133b017324..0d84d1eb17571b8ffbcbefec8d5c700ff917ab5d 100644
--- a/libraries/technology/eth_10g/hdllib.cfg
+++ b/libraries/technology/eth_10g/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tech_eth_10g
 hdl_library_clause_name = tech_eth_10g_lib
-hdl_lib_uses = technology tech_pll tech_mac_10g tech_10gbase_r tech_xaui common dp
+hdl_lib_uses_synth = technology tech_pll tech_mac_10g tech_10gbase_r tech_xaui common dp
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/fifo/hdllib.cfg b/libraries/technology/fifo/hdllib.cfg
index 508646c3fd9668e7bd4429654281f77ddb62c584..b2d074b09e1dbf5230d7a0244d097d99d6fe70c6 100644
--- a/libraries/technology/fifo/hdllib.cfg
+++ b/libraries/technology/fifo/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tech_fifo
 hdl_library_clause_name = tech_fifo_lib
-hdl_lib_uses = technology ip_stratixiv_fifo ip_arria10_fifo
+hdl_lib_uses_synth = technology ip_stratixiv_fifo ip_arria10_fifo
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/flash/hdllib.cfg b/libraries/technology/flash/hdllib.cfg
index 476645dbafb703131e791d36f240ad75ba93d1cb..3bdbd53fe71c9278383959937d128d8457a580b2 100644
--- a/libraries/technology/flash/hdllib.cfg
+++ b/libraries/technology/flash/hdllib.cfg
@@ -1,9 +1,11 @@
 hdl_lib_name = tech_flash
 hdl_library_clause_name = tech_flash_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
                ip_stratixiv_flash
                ip_arria10_asmi_parallel
                ip_arria10_remote_update
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/hdllib.cfg b/libraries/technology/hdllib.cfg
index bacf425f6495ed0fac1f72735df25bf4a6d6a4be..e462be7213601b81bf1b133b894ef520b7476c65 100644
--- a/libraries/technology/hdllib.cfg
+++ b/libraries/technology/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = technology
 hdl_library_clause_name = technology_lib
-hdl_lib_uses =
+hdl_lib_uses_synth =
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/iobuf/hdllib.cfg b/libraries/technology/iobuf/hdllib.cfg
index 32d9e77067c851dbe1cfadb1ce05eff116703f84..d6b8f5fa73f40cd2d5dbb223c06f044ddb1302d1 100644
--- a/libraries/technology/iobuf/hdllib.cfg
+++ b/libraries/technology/iobuf/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tech_iobuf
 hdl_library_clause_name = tech_iobuf_lib
-hdl_lib_uses = technology ip_stratixiv_ddio ip_arria10_ddio
+hdl_lib_uses_synth = technology ip_stratixiv_ddio ip_arria10_ddio
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/ddio/hdllib.cfg b/libraries/technology/ip_arria10/ddio/hdllib.cfg
index da14258e6ed41cc23e0576714c2906604ab56000..8dd8cfcc819f0e8f7fae6c662fe590c7857679ec 100644
--- a/libraries/technology/ip_arria10/ddio/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ddio/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_ddio
 hdl_library_clause_name = ip_arria10_ddio_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/ddr4_4g_1600/hdllib.cfg b/libraries/technology/ip_arria10/ddr4_4g_1600/hdllib.cfg
index 0b90e333fbe77493268e059c434bdf3ff49f2b48..f13fb6c032d2f1e1b41dbf9821924198d135cb15 100644
--- a/libraries/technology/ip_arria10/ddr4_4g_1600/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ddr4_4g_1600/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_ddr4_4g_1600
 hdl_library_clause_name = ip_arria10_ddr4_4g_1600_altera_emif_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/ddr4_8g_2400/hdllib.cfg b/libraries/technology/ip_arria10/ddr4_8g_2400/hdllib.cfg
index d15b6e4ff067a76fc74cb17d0bf20187fbc5d9ff..3bafe0c312fd6b809c5db1937745e749b5158a93 100644
--- a/libraries/technology/ip_arria10/ddr4_8g_2400/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ddr4_8g_2400/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_ddr4_8g_2400
 hdl_library_clause_name = ip_arria10_ddr4_8g_2400_altera_emif_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/ddr4_mem_model_141/hdllib.cfg b/libraries/technology/ip_arria10/ddr4_mem_model_141/hdllib.cfg
index a952090c1b97a3cec6d93a2c05dd9455db903f19..810893906aeb7053b8f788f0133d106bc09ffb82 100644
--- a/libraries/technology/ip_arria10/ddr4_mem_model_141/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ddr4_mem_model_141/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_ddr4_mem_model_141
 hdl_library_clause_name = ed_sim_altera_emif_mem_model_core_ddr4_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/fifo/hdllib.cfg b/libraries/technology/ip_arria10/fifo/hdllib.cfg
index f3c7f424ace2621ad4cca2e5abe74f86377d28df..c0f71a0fbb2d94695baca44dfdae857f156b0028 100644
--- a/libraries/technology/ip_arria10/fifo/hdllib.cfg
+++ b/libraries/technology/ip_arria10/fifo/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_fifo
 hdl_library_clause_name = ip_arria10_fifo_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg b/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg
index 5228427403710fed486bbc003051472f113b5b2b..6e75046f20998bc395561d23eaeacb3e675861ad 100644
--- a/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg
+++ b/libraries/technology/ip_arria10/flash/asmi_parallel/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_asmi_parallel
 hdl_library_clause_name = ip_arria10_asmi_parallel_altera_asmi_parallel_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg b/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg
index bf9062c9e1d0a129f12b00b72991c07557055523..01c1c070c1c78f63337180e688dc0e85818f2998 100644
--- a/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg
+++ b/libraries/technology/ip_arria10/flash/remote_update/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_remote_update
 hdl_library_clause_name = ip_arria10_remote_update_altera_remote_update_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/mac_10g/hdllib.cfg b/libraries/technology/ip_arria10/mac_10g/hdllib.cfg
index fc5620217242ecb6bd023bf2afff36a3fa8efe42..e4db35ab5caeaeb72261d35eb8a9daaf7e5f5a0b 100644
--- a/libraries/technology/ip_arria10/mac_10g/hdllib.cfg
+++ b/libraries/technology/ip_arria10/mac_10g/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_mac_10g
 hdl_library_clause_name = ip_arria10_mac_10g_alt_em10g32_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/phy_10gbase_r/hdllib.cfg b/libraries/technology/ip_arria10/phy_10gbase_r/hdllib.cfg
index 33e4b6072b76d2893ecc37e49844c27d676e603c..98abcb4b91cfdb0bb79eb735f3f177e4162750fa 100644
--- a/libraries/technology/ip_arria10/phy_10gbase_r/hdllib.cfg
+++ b/libraries/technology/ip_arria10/phy_10gbase_r/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_phy_10gbase_r
 hdl_library_clause_name = ip_arria10_phy_10gbase_r_altera_xcvr_native_a10_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/pll_clk125/hdllib.cfg b/libraries/technology/ip_arria10/pll_clk125/hdllib.cfg
index a09fe31c2dd58c7334f7befaf2541d639b303bd6..135890b463ce28e31a1c4f30b9bd97e8f0c0f963 100644
--- a/libraries/technology/ip_arria10/pll_clk125/hdllib.cfg
+++ b/libraries/technology/ip_arria10/pll_clk125/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_pll_clk125 
 hdl_library_clause_name = ip_arria10_pll_clk125_altera_iopll_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/pll_clk200/hdllib.cfg b/libraries/technology/ip_arria10/pll_clk200/hdllib.cfg
index b6b225226700a81d16415c298be2d3da552b02e7..2dbd996323be46c582ed1d3ad43b269c70670bda 100644
--- a/libraries/technology/ip_arria10/pll_clk200/hdllib.cfg
+++ b/libraries/technology/ip_arria10/pll_clk200/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_pll_clk200  
 hdl_library_clause_name = ip_arria10_pll_clk200_altera_iopll_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/pll_clk25/hdllib.cfg b/libraries/technology/ip_arria10/pll_clk25/hdllib.cfg
index 098de55e66e9daf8eeba0f80103b1cf96213dc53..108b30aa2cc64d530218d9bb54607366566bf73f 100644
--- a/libraries/technology/ip_arria10/pll_clk25/hdllib.cfg
+++ b/libraries/technology/ip_arria10/pll_clk25/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_pll_clk25 
 hdl_library_clause_name = ip_arria10_pll_clk25_altera_iopll_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/hdllib.cfg b/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/hdllib.cfg
index 3c92564f783e48e6e05cf490115be32ca3639033..8c1f767a78107daf69f892775ec2bb985863361d 100644
--- a/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/hdllib.cfg
+++ b/libraries/technology/ip_arria10/pll_xgmii_mac_clocks/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_pll_xgmii_mac_clocks  
 hdl_library_clause_name = ip_arria10_pll_xgmii_mac_clocks_altera_xcvr_fpll_a10_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/ram/hdllib.cfg b/libraries/technology/ip_arria10/ram/hdllib.cfg
index dc1bb2232abbca865ab77ce70f517bbcfe283718..ea1f398e9fd68d5b6d770c6f9e23a42579c478a3 100644
--- a/libraries/technology/ip_arria10/ram/hdllib.cfg
+++ b/libraries/technology/ip_arria10/ram/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_ram
 hdl_library_clause_name = ip_arria10_ram_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/transceiver_pll_10g/hdllib.cfg b/libraries/technology/ip_arria10/transceiver_pll_10g/hdllib.cfg
index 5474ddf598df3954f93eb79a98f78b75dd98ba1c..e3b72f5c34ba4459aeaae8419778077d184c1ca6 100644
--- a/libraries/technology/ip_arria10/transceiver_pll_10g/hdllib.cfg
+++ b/libraries/technology/ip_arria10/transceiver_pll_10g/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_transceiver_pll_10g
 hdl_library_clause_name = ip_arria10_transceiver_pll_10g_altera_xcvr_atx_pll_a10_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/transceiver_reset_controller_1/hdllib.cfg b/libraries/technology/ip_arria10/transceiver_reset_controller_1/hdllib.cfg
index 2075b80c643cefefc52571f0115f153b3bbff582..e57b4512811bd5a47d7d6792a72b76c37abd5496 100644
--- a/libraries/technology/ip_arria10/transceiver_reset_controller_1/hdllib.cfg
+++ b/libraries/technology/ip_arria10/transceiver_reset_controller_1/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_transceiver_reset_controller_1
 hdl_library_clause_name = ip_arria10_transceiver_reset_controller_1_altera_xcvr_reset_control_141
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/tse_sgmii_gx/hdllib.cfg b/libraries/technology/ip_arria10/tse_sgmii_gx/hdllib.cfg
index 82eaefae08e0ff33159447eb7109353c5b43b1ba..aaceea9fe5d601e43e6ba7f207cc5ec254adafea 100644
--- a/libraries/technology/ip_arria10/tse_sgmii_gx/hdllib.cfg
+++ b/libraries/technology/ip_arria10/tse_sgmii_gx/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_tse_sgmii_gx
 hdl_library_clause_name = ip_arria10_tse_sgmii_gx_altera_eth_tse_141
-hdl_lib_uses = common
+hdl_lib_uses_synth = common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_arria10/tse_sgmii_lvds/hdllib.cfg b/libraries/technology/ip_arria10/tse_sgmii_lvds/hdllib.cfg
index 4d85522baecd537d99dd5ebb229ac26c0906e53b..2e686defe7abb45f0068a9767620220477f6a0db 100644
--- a/libraries/technology/ip_arria10/tse_sgmii_lvds/hdllib.cfg
+++ b/libraries/technology/ip_arria10/tse_sgmii_lvds/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_arria10_tse_sgmii_lvds
 hdl_library_clause_name = ip_arria10_tse_sgmii_lvds_altera_eth_tse_141
-hdl_lib_uses = common
+hdl_lib_uses_synth = common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/ddio/hdllib.cfg b/libraries/technology/ip_stratixiv/ddio/hdllib.cfg
index e82cbc3291a3235b65d3fc1eda521330be289ebc..14af6d24223a32d8ed4fef2c39c94a6e6d2c4d8e 100644
--- a/libraries/technology/ip_stratixiv/ddio/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddio/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_ddio
 hdl_library_clause_name = ip_stratixiv_ddio_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/ddr3_mem_model/hdllib.cfg b/libraries/technology/ip_stratixiv/ddr3_mem_model/hdllib.cfg
index d70ef4e7966fd190cd8cc5ae9413523a4a4f3044..db9c5c2f1dd3709083a626774bc5cd89ad2459e7 100644
--- a/libraries/technology/ip_stratixiv/ddr3_mem_model/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddr3_mem_model/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_ddr3_mem_model
 hdl_library_clause_name = ip_stratixiv_ddr3_mem_model_lib
-hdl_lib_uses = ip_stratixiv_ddr3_uphy_4g_800_master
+hdl_lib_uses_synth = ip_stratixiv_ddr3_uphy_4g_800_master
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/hdllib.cfg b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/hdllib.cfg
index 57967a8eab0370b97dcc6790b07b8ca7cf04fb4d..61083f6434fae7a86363060a5b2274987360e17b 100644
--- a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_master/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_ddr3_uphy_4g_800_master
 hdl_library_clause_name = ip_stratixiv_ddr3_uphy_4g_800_master_lib
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/hdllib.cfg b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/hdllib.cfg
index fe6cfd93a45006f955bebddd69fc291c47010701..18f034da58ce68758000b85b17f2df0d7d4fb379 100644
--- a/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ddr3_uphy_4g_800_slave/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_ddr3_uphy_4g_800_slave
 hdl_library_clause_name = ip_stratixiv_ddr3_uphy_4g_800_slave_lib
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/fifo/hdllib.cfg b/libraries/technology/ip_stratixiv/fifo/hdllib.cfg
index 81691fa17c57f3d52e10acfcaf74c8caccb74a3b..52d4b3324d887d7568eafdc92b6b6dd1aaa0aa63 100644
--- a/libraries/technology/ip_stratixiv/fifo/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/fifo/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_fifo
 hdl_library_clause_name = ip_stratixiv_fifo_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/flash/hdllib.cfg b/libraries/technology/ip_stratixiv/flash/hdllib.cfg
index 799e8d8470a4fd963a718acce3c3c2535f549ecd..e8939acd91afce768ba464888d7cffa52aa6332a 100644
--- a/libraries/technology/ip_stratixiv/flash/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/flash/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_flash
 hdl_library_clause_name = ip_stratixiv_flash_lib
-hdl_lib_uses = technology numonyx_m25p128
+hdl_lib_uses_synth = technology numonyx_m25p128
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/mac_10g/hdllib.cfg b/libraries/technology/ip_stratixiv/mac_10g/hdllib.cfg
index 93c52dfd10a48fbca6769da826dde602f7ed75a9..907141daf6d1f46783f74e689f3de97c215d6506 100644
--- a/libraries/technology/ip_stratixiv/mac_10g/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/mac_10g/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_mac_10g
 hdl_library_clause_name = ip_stratixiv_mac_10g_lib
-hdl_lib_uses = common
+hdl_lib_uses_synth = common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/phy_xaui/hdllib.cfg b/libraries/technology/ip_stratixiv/phy_xaui/hdllib.cfg
index db28a1873aac342a2cf1874a3d0b4b9039274b0c..e113b7b811af1bf6a24e558e20b6d50e370717b6 100644
--- a/libraries/technology/ip_stratixiv/phy_xaui/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/phy_xaui/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_phy_xaui
 hdl_library_clause_name = ip_stratixiv_phy_xaui_lib
-hdl_lib_uses = common
+hdl_lib_uses_synth = common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/pll/hdllib.cfg b/libraries/technology/ip_stratixiv/pll/hdllib.cfg
index a1e2b26705e5e8053043204dabb3f11193e5bd10..de30587c2ceb74931301c2f7a80d63e1d7be7ee0 100644
--- a/libraries/technology/ip_stratixiv/pll/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/pll/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_pll
 hdl_library_clause_name = ip_stratixiv_pll_lib
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/ram/hdllib.cfg b/libraries/technology/ip_stratixiv/ram/hdllib.cfg
index caaf5c169acdc202bac55d096d47b32060f7b312..269f8706f0acbd152a2d7418ca7a2a3ee439ca57 100644
--- a/libraries/technology/ip_stratixiv/ram/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/ram/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_ram
 hdl_library_clause_name = ip_stratixiv_ram_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/transceiver/hdllib.cfg b/libraries/technology/ip_stratixiv/transceiver/hdllib.cfg
index bd82e039dc231a1217865e5074701e076bdd65cf..a76a34764a74f4550941ab19281115fe048491e0 100644
--- a/libraries/technology/ip_stratixiv/transceiver/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/transceiver/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_transceiver
 hdl_library_clause_name = ip_stratixiv_transceiver_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/tse_sgmii_gx/hdllib.cfg b/libraries/technology/ip_stratixiv/tse_sgmii_gx/hdllib.cfg
index d9b6086fb916d1fe6771164028171c6205711837..cbb612419b04dfe0801a125233c4c13d9556962f 100644
--- a/libraries/technology/ip_stratixiv/tse_sgmii_gx/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/tse_sgmii_gx/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_tse_sgmii_gx
 hdl_library_clause_name = ip_stratixiv_tse_sgmii_gx_lib
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_stratixiv/tse_sgmii_lvds/hdllib.cfg b/libraries/technology/ip_stratixiv/tse_sgmii_lvds/hdllib.cfg
index 9dfc393f95c2a7ff2a5db7d03a24b6b3de9c5e61..35af33dd2515e870b01a609700c04b317ee2b037 100644
--- a/libraries/technology/ip_stratixiv/tse_sgmii_lvds/hdllib.cfg
+++ b/libraries/technology/ip_stratixiv/tse_sgmii_lvds/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_stratixiv_tse_sgmii_lvds
 hdl_library_clause_name = ip_stratixiv_tse_sgmii_lvds_lib
-hdl_lib_uses = common
+hdl_lib_uses_synth = common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/ip_virtex4/hdllib.cfg b/libraries/technology/ip_virtex4/hdllib.cfg
index 2e1c58252f020301cfe5a3ec8443c3712961dc1d..d0ec5e923ca9b02d4f24ae0e9e79f560e3a3ddb5 100644
--- a/libraries/technology/ip_virtex4/hdllib.cfg
+++ b/libraries/technology/ip_virtex4/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = ip_virtex4
 hdl_library_clause_name = ip_virtex4_lib
-hdl_lib_uses = 
+hdl_lib_uses_synth = 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_virtex4
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/mac_10g/hdllib.cfg b/libraries/technology/mac_10g/hdllib.cfg
index c94bb8f787060af40746225a03e231bdc15bb63a..5f7b80804ee024b6db3e46982e9b6c64e800be24 100644
--- a/libraries/technology/mac_10g/hdllib.cfg
+++ b/libraries/technology/mac_10g/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tech_mac_10g
 hdl_library_clause_name = tech_mac_10g_lib
-hdl_lib_uses = technology ip_stratixiv_mac_10g ip_arria10_mac_10g common dp
+hdl_lib_uses_synth = technology ip_stratixiv_mac_10g ip_arria10_mac_10g common dp
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/memory/hdllib.cfg b/libraries/technology/memory/hdllib.cfg
index 48201c4ced626699f93aaee050e58433a1404e7f..44f7953559ed9e5158b8707ecab8fb357352e074 100644
--- a/libraries/technology/memory/hdllib.cfg
+++ b/libraries/technology/memory/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tech_memory
 hdl_library_clause_name = tech_memory_lib
-hdl_lib_uses = technology ip_stratixiv_ram ip_arria10_ram
+hdl_lib_uses_synth = technology ip_stratixiv_ram ip_arria10_ram
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/pll/hdllib.cfg b/libraries/technology/pll/hdllib.cfg
index 3f0ddfe5a6e7973640f5dccaf1b1d5430c751c15..ba8cb3b948e22097c860919a38b3d3b0d46d09bb 100644
--- a/libraries/technology/pll/hdllib.cfg
+++ b/libraries/technology/pll/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tech_pll
 hdl_library_clause_name = tech_pll_lib
-hdl_lib_uses = technology ip_stratixiv_pll ip_arria10_pll_xgmii_mac_clocks ip_arria10_pll_clk200 ip_arria10_pll_clk25 ip_arria10_pll_clk125 common
+hdl_lib_uses_synth = technology ip_stratixiv_pll ip_arria10_pll_xgmii_mac_clocks ip_arria10_pll_clk200 ip_arria10_pll_clk25 ip_arria10_pll_clk125 common
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/transceiver/hdllib.cfg b/libraries/technology/transceiver/hdllib.cfg
index abd20a12f3df647e1a73537318e87d13366d3b8c..846596a1f36889d30d80276fb33d99db5c7fe875 100644
--- a/libraries/technology/transceiver/hdllib.cfg
+++ b/libraries/technology/transceiver/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = tech_transceiver
 hdl_library_clause_name = tech_transceiver_lib
-hdl_lib_uses = technology ip_stratixiv_transceiver common dp
+hdl_lib_uses_synth = technology ip_stratixiv_transceiver common dp
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/tse/hdllib.cfg b/libraries/technology/tse/hdllib.cfg
index 308bf9557fc9cc55e1bc8229a19ef44e33680742..1ef7efdcb1f6b93458491b311c0e89c6f90ba90a 100644
--- a/libraries/technology/tse/hdllib.cfg
+++ b/libraries/technology/tse/hdllib.cfg
@@ -1,9 +1,11 @@
 hdl_lib_name = tech_tse
 hdl_library_clause_name = tech_tse_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
                ip_stratixiv_tse_sgmii_lvds ip_stratixiv_tse_sgmii_gx
                ip_arria10_tse_sgmii_lvds   ip_arria10_tse_sgmii_gx
                common dp
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/libraries/technology/xaui/hdllib.cfg b/libraries/technology/xaui/hdllib.cfg
index a6e170718d1bafa981a913bc2f2c202599180872..f93736e7ce9168d01f1e589338949b5692aff714 100644
--- a/libraries/technology/xaui/hdllib.cfg
+++ b/libraries/technology/xaui/hdllib.cfg
@@ -1,11 +1,13 @@
 hdl_lib_name = tech_xaui
 hdl_library_clause_name = tech_xaui_lib
-hdl_lib_uses = technology
+hdl_lib_uses_synth = technology
                ip_stratixiv_transceiver
                ip_stratixiv_phy_xaui
                tech_transceiver
                common
                dp
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = 
 
 build_dir_sim = $HDL_BUILD_DIR