Added supprot for input and environment varialbles