Make Pancake ready for DeepTrace v2