Better SKUS for the demo content
Added equipment field and moved other fields from *_commerce