Upgrades to interfaces - key handling