Little work on ContentFactory to make it easier to add new Product types