Add more informative tracing