adding staging support