Added support for product detection