Merge pull request #1 from 30x/newschema

Newschema