Added v2 schema and renamed v3