Extra support for S-Class TD messages