Now Properly uses Product definitions