Changed the message model