Added debug traces