Migrated to modular approach to product type relation.