Version refactoring + upgrades + many properties