made cfn_vars more generic