Improved the debuging information