Added support for advanced logging