Now Auto-Add_Units is a option in Settings.