Modified message envelope and added Listeners