Switched Table to be Variant-based.