Upgrade UniqueWindowsInterface