Changes for new server provisiioning