EUROMAP 60 revised to distinguish between machine-related and product-related energy consumption