Converted debug display to std map