Optimizing CSP Storage Capacity