Move the logic for adding the product data to an event subscriber

This should make it easier to replace the current logic and allow users to remove / replace it with their own.