Added more debug traces