Update Manager to fix a more generic map interface