Change Structure to add v2 Add() Function