Overhaul, update sourcetrace