Added ability to hide trace and systems