Added usage of ENV Variables