Add support of more env variable.

This is needed for a new cluster.