Changed order of methods in Generator - util methods first