Some changes to the logging component