Use a dictionary for tags (was a list)