Added support for multiple code traces