Add more debug messges