Improved debuggability