Optimizing the infrastructure