Add catalog, index, and thread classes