Additional changes to the logging feature