Updated with taxonomy terms.  Perhaps other updates.