Next step should standard the log utils