BROKEN (little bit) - Improved schema versioning