Add staging support