Added SD_MESSAGE constants and add_messageid_match method