Improve checkpoint calculation to allow filtering of packet types