Add Vanir support