added refactored trace model