More work on ProductContainer