Some more refactoring of the Contact/Item classes