New Schema structure done