Added setters to Message class, and updated all code to make use of them