Adding more debug information