General updates for new environment