Add more TRACE's