Added support for variant_dir