New version of schema, updated from Kevin comments