Feature/generation for 1.0