Refactoring in TRAFFIC namespace.
try merge