Adding some missing stuff for tracing and restart