Added support for variants