Added Environment andDemographic assignments