[FEATURE]: Added environment variable substitution using