339 new schema

Fixes #339