Adding support for dynamic messaging

Change-Id: Ie0b1623dc05f5b68535eca2bd15ca777d91ebc19