Changed for generation to happen during parsing