Now handling extended message ID as well