NF: Bunch of changes to include new 'variant' field throughout