CS-5: Simplified product provisioning