CS-3 CS-5: Improved user and product management