Moved ProductValue to Entity namespace