Add staging cap support