modified catalog and product model