Ported the tracing changes to shoe box