Temporary v2 additions