Added receiver id mapping to messages