Fix build
Fix mapping product to view model