first refactoring after linking presentation to product type. Refs item:274