PIM-2272: Remove wrong call in handler
PIM-2272: Change behavior of product datasource
PIM-2272: Organize use statements