Added mapping for product and variant entities