Updates to support deployment