Logs improvement