Worked on improving debuggability