Support more staging cases