Improve info mode utility