Added Environment variables support.