Updated with Schema V2.