Updated for canonical id message