Added optimized trace