Unbreak `Add Product' with regards to new attributes API