Add more debug info