More Product and ProductManager updates