sample-data.xml and Message improvement