VariantFactory should now work, but some string constants probably need to change.