Make generator static and add call in project
Changed generator logic