Improve Debug Logs by utilizing new custom class