Merge with add-logger