Add staging, production functionality