Product entity relationship mapping fix