Changed object structure for messages