Updating views to handle env variables