Improve debuggability