Improve feedback of autogenerate tool