Added tokenised formatting of logs