Further changes to Logging