Added organizations and environments