ProductSelector changes