Change schema to reduce indexing and use nesting