Added message type to entity response