Added line tracing support