Improved trace command