Move packet preparations to generics