updates to support multiple environments