MINOR CHNAGE: DataFormat changed in Message Service