Improve multi-packet SDT and PMT