added data message expansion