Removed PacketWrapper dependency