Updated classes for new catalog references