updated based on latest generators templates