Move from explicit sub-packets to implicit ones