Add more debug messages