Added more environment variables