Swept a bit of dust from code to make it more concurrent safe
Fixed support integrating MessageUtils Library