Added rudimentary S-Class message tracking