Added Message structure to model