Fixes #88 Add SchemaBuilder