Feature/generator v2