Changes to common and generated_flag