Adding some more traces for better debuggability