Added staging2 support