Rewrote packets structure storage approach