Added support for trace