Adding debug information
Improved debugging info