Added a TABLE and a guard-id

These will be used to make it possible to start tracing after a guard failure