Update schemas
Merge pull request #36 from jgho/schemaUpdates

Update schemas