Updated to use new catalog