Changes due to new catalog structure.