Adding more debugging info