State table reorganisation
State linking in the forwarding case