Added improved debug information