Adding more debug info