Updated for the 10.10 catalogs