1.1- Function Builders optional. Fix Generator Detection.