V3 schemas

Change-Id: Ie3aecbf494df37a7b0dae18d8fbb0659fd9719df