CS-5: Improved product management