Added support for log