Updating comment and restore method becomes more standardized