Added flexible upgrade recipes