Replaced Variant with a custom type