Added/Updated the logic to figure out the type of packet in some properties...