Fixed namespace issue with Environment class