Add more debug information