Update Schema. Closes #17