Add checks for supported variant types