Add more user interaction, Increase high cohesion for Product