Basket DGV (s-off) & Product refactor