Improved tracing

Author: Maulik Patel