Add functionality for generation correct source messages