Updated model and network to match new packet structure