Updated debug helper