The Canadian Astronomy Data Centre manages a heterogeneous collection of data from the following ground and space-based telescopes: CFHT, DRAO, FUSE, Gemini, HST, JCMT, and MOST. The archive data models implemented for these data collections are ten years old and pre-date two important developments: the Virtual Observatory and the systematic generation and management of data products. Three years ago, we began the process of supporting access to processed data products through IVOA protocols such as SIA by building a layer over the archive data models. Today, we now realise that this approach of layering VO models on archive models is not sufficient and that every archive must be re-tooled to properly support the VO – from the storage model through to the query, processing and access models. The CADC has begun an ambitious software development effort to implement a new infrastructure to serve both telescope archive and Virtual Observatory needs.