Prediction of CME arrival times at SWPC rely on the WSA-Enlil model. Multi-perspective coronagraph observations are ingested via the CAT application. I will describe substantial enhancements that are currently being developed for both CAT and the model prediction pipeline. These are designed to leverage new observations, to support future enhancements in modeling and data assimilation, and to address user needs such as probabilistic forecasting and uncertainty quantification.