Merged & Added Messages modules