Basic support for schemas
Bugfixes