Fix schema

Partially fixes #19