Restructure schema creation to include indexes on embedded members