Updated Product entity and mapper, and deal entity and mapper.