Added variant_dir support at root level