Placeholder classes and changes to upgrades