Changes for new debug format