Use AbstractProductPrice instead of ProductPrice where possible