Improved gii generators