Updated environment structure