Minimal change to Product constructor