Migrated vendor_id_payload to INIT/METHOD macros