Refactored product completeness