Added DebugTrace classes, some simplifications