Refactored code to have both Dialog and Etisalat senders and recievers with both Subcription and Event Based application types