Logging improvements
v1.2.0