Add V2 methods (WIP)