More interface upgrades