Add more debug information for tracking details