Initial draft of V2 schema