Add more logging to determine bottlenecks