Add support for (non-recursive) variations