Improved trace detection & fixed namespaces collision with modifiers