added support for trace remapping