Updated environment dump code to new standards