diff --git a/suites/smpp/esme_ms_sms_transaction.py b/suites/smpp/esme_ms_sms_transaction.py
index adc9dae..16b01cc 100755
--- a/suites/smpp/esme_ms_sms_transaction.py
+++ b/suites/smpp/esme_ms_sms_transaction.py
@@ -10,26 +10,36 @@
 
 SMPP_ESME_RINVDSTADR = 0x0000000B
 
-nitb = suite.nitb()
+hlr = suite.hlr()
 bts = suite.bts()
+mgw_msc = suite.mgw()
+mgw_bsc = suite.mgw()
+stp = suite.stp()
+msc = suite.msc(hlr, mgw_msc, stp)
+bsc = suite.bsc(msc, mgw_bsc, stp)
+bsc.bts_add(bts)
+
 ms = suite.modem()
 esme = suite.esme()
+msc.smsc.esme_add(esme)
 
-print('start nitb and bts...')
-nitb.bts_add(bts)
-nitb.smsc.esme_add(esme)
-nitb.start()
+hlr.start()
+stp.start()
+msc.start()
+mgw_msc.start()
+mgw_bsc.start()
+bsc.start()
 bts.start()
-wait(nitb.bts_is_connected, bts)
+wait(bsc.bts_is_connected, bts)
 
 esme.connect()
-nitb.subscriber_add(ms)
-ms.connect(nitb.mcc_mnc())
+hlr.subscriber_add(ms)
+ms.connect(msc.mcc_mnc())
 
 ms.log_info()
 print('waiting for modem to attach...')
-wait(ms.is_connected, nitb.mcc_mnc())
-wait(nitb.subscriber_attached, ms)
+wait(ms.is_connected, msc.mcc_mnc())
+wait(msc.subscriber_attached, ms)
 
 print('sending first sms...')
 msg = Sms(esme.msisdn, ms.msisdn, 'smpp send message')