Add more debug statements