Modify common patches schema to per branch