Updated message class to getter/setter