Increase debuggability