Improve Architect generator