Merge pull request #2 from cokernel/master

Schema fixes