Added classes for the message entities