Upgrading to new modular components