Harmonize logging and add new logs