Adapt products to needs

Adapt products to needs