Small schema refactoring towards ConfigDocument versioning