Update for new environment