Currently only two environment variables are accessed through validator, I think we should use it for all.
Currently only two environment variables are accessed through validator, I think we should use it for all.