Add Vanish support