Refactor Item and Contact to make all fields as objects.
Re-adding support for Email addresses with refactored code