Add more debug log statements