Applied Furnace-manager changes to Addon Manager