Upgrade-Ready Configuration Logic