Updated changes after refactoring Variant.