added support for log tokens