[Build] Improved tracing