Add variant with expression decomposition