Added debug info generation