Environment is now always Map<String, String>