Schema Revamped for minimal nesting -WIP