Improved creation and upgrading, especially on Object