Added support for product attributes