Fix #3, use schema versioning